Merge branch 'places-sidebar'
authorFederico Mena Quintero <federico@gnome.org>
Sat, 20 Apr 2013 18:56:16 +0000 (14:56 -0400)
committerFederico Mena Quintero <federico@gnome.org>
Sat, 20 Apr 2013 18:56:16 +0000 (14:56 -0400)

Trivial merge